From: Dongxiao Xu Date: Fri, 30 Nov 2012 09:23:57 +0000 (+0000) Subject: nested vmx: enable Descriptor-table exiting for L1 VMM X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7595 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d2bddeb9d55066b0c508fd925cf578f54ffbd2f9;p=xen.git nested vmx: enable Descriptor-table exiting for L1 VMM Signed-off-by: Dongxiao Xu Acked-by: Jun Nakajima Committed-by: Keir Fraser --- diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 14a3d62e55..23c949be9f 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1300,7 +1300,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) break; case MSR_IA32_VMX_PROCBASED_CTLS2: /* 1-seetings */ - data = 0; + data = SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING; /* 0-settings */ tmp = 0; data = (data << 32) | tmp; @@ -1507,6 +1507,12 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, if ( ctrl & CPU_BASED_MONITOR_TRAP_FLAG) nvcpu->nv_vmexit_pending = 1; break; + case EXIT_REASON_ACCESS_GDTR_OR_IDTR: + case EXIT_REASON_ACCESS_LDTR_OR_TR: + ctrl = __n2_secondary_exec_control(v); + if ( ctrl & SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING ) + nvcpu->nv_vmexit_pending = 1; + break; /* L1 has priority handling several other types of exits */ case EXIT_REASON_HLT: ctrl = __n2_exec_control(v); diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 4f58991d8b..053de17e4f 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -179,6 +179,7 @@ extern u32 vmx_vmentry_control; #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001 #define SECONDARY_EXEC_ENABLE_EPT 0x00000002 +#define SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING 0x00000004 #define SECONDARY_EXEC_ENABLE_RDTSCP 0x00000008 #define SECONDARY_EXEC_ENABLE_VPID 0x00000020 #define SECONDARY_EXEC_WBINVD_EXITING 0x00000040